From: Jim Blandy <jimb@redhat.com>
Date: Sat, 20 Mar 1993 20:48:34 +0000 (+0000)
Subject: * xfns.c (Fx_open_connection): If we have X11R5, use
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~96777
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=eb5d618c18e7e75a82adc7b441cf18da07a337f4;p=emacs.git

* xfns.c (Fx_open_connection): If we have X11R5, use
	XrmSetDatabase to set the display's database.  In older versions,
	just store the value into x_current_display->db.
---

diff --git a/src/xfns.c b/src/xfns.c
index cf55cc6c3e1..8d411508dcd 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3756,7 +3756,11 @@ arg XRM_STRING is a string of resources in xrdb format.")
   else
     xrm_option = (unsigned char *) 0;
   xrdb = x_load_resources (x_current_display, xrm_option, EMACS_CLASS);
+#ifdef HAVE_X11R5
+  XrmSetDatabase (x_current_display, xrdb);
+#else
   x_current_display->db = xrdb;
+#endif
 
   x_screen = DefaultScreenOfDisplay (x_current_display);